Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:31:09 +0000 (22:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:31:09 +0000 (22:31 -0700)
commit71adb7d254c0372903ca36014f7893ce3a94df76
tree9aad7ad2822c1cd298addb794bde958ee471e4fc
parent72f838d47543177aaa33e5ac482c8005913cc633
parent997aa54195bbfa074c041a6f383399b35eb591c9
Merge from trunk.